Skip to content

[All] Clean lifecycle for v21.06 #2198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
fredroy merged 34 commits into from
Jun 28, 2021
Merged

[All] Clean lifecycle for v21.06 #2198

fredroy merged 34 commits into from
Jun 28, 2021

Conversation

@guparan
Copy link
Contributor

@guparan guparan commented Jun 24, 2021 •
edited
Loading

#2197 should be merged first

[ci-depends-on https://github.com/sofa-framework/SofaPython3/pull/150]

Cleaning (removing or setting "deleted") things that have been deprecated for long enough (some of them since 2017...).

Also

  • improved the SOFA_DEPRECATED_HEADER macro to be consistent with SOFA_ATTRIBUTE_DEPRECATED.
  • added SOFA_DISABLED_HEADER and SOFA_DISABLED_HEADER_NOT_REPLACED macros
  • expanded namespace deprecation in SofaExporter

By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).

Reviewers will merge this pull-request only if

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

guparan and others added 18 commits June 17, 2021 11:40
@guparan
[All] Remove LennardJonesForceField and Elasticity_test_deprecated
1880c87 
Deprecated since v17.12
@guparan
[All] Remove empty SOFA_WITH_DEPRECATED_COMPONENTS blocks
8d1f624
@guparan
[SofaCore] Delete deprecated code
a94dc54 
marked with SOFA_ATTRIBUTE_DEPRECATED__CLASSNAME_INTROSPECTION
@guparan
[All] Remove compat headers flagged for v21.06
a5eb134
@guparan
[Sofa.Config] Improve SOFA_DEPRECATED_HEADER + Add SOFA_DISABLED_HEADER
80c3e68
@guparan
[Sofa.Compat] Disable headers deprecated since sofa-framework#1649
8fdd43c
@guparan
[All] Make SOFA_DEPRECATED_HEADER consistent with SOFA_ATTRIBUTE_* ma…
c64914b 
…cros
@guparan
[SofaCore] Disable code deprecated since sofa-framework#1627
01bb4e9
@guparan
[SofaCore] Disable code deprecated since sofa-framework#1626
5fffb1c
@guparan
[SofaGeneralSimpleFem] Disable headers following sofa-framework#2099
239c45f
@guparan
[All] Remove old deprecated code
feed779 
Deprecated since v19.12, should have been removed at v20.06
@guparan
[All] FIX old "gl.h" and "glu.h" includes
899e4fe
@guparan
[All] Remove code marked "to be removed for v19.12"
da18af3
@guparan
[All] CLEAN a lot of deprecated code
399decf
@guparan
[SofaExporter] Clean and expand namespace deprecation
09c5d34
@fredroy
disable vec4f uses in drawtool
932c124
@fredroy
replace in compliant flexible
45a012d
@fredroy
replace in other plugins
d19a063
@guparan guparan added pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status to review To notify reviewers to review this pull-request pr: clean Cleaning the code labels Jun 24, 2021
@guparan guparan added this to the v21.06 milestone Jun 24, 2021
guparan
guparan commented Jun 24, 2021
View reviewed changes
SofaKernel/modules/SofaCore/src/sofa/core/ObjectFactory.h
Comment on lines +75 to +76
SOFA_ATTRIBUTE_DISABLED__CLASSNAME_INTROSPECTION()
std::string shortName(objectmodel::BaseObjectDescription* arg) = delete;
Copy link
Contributor Author

@guparan guparan Jun 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not 100% sure about the changes in this file 🤔
@damienmarchal Could you validate?

@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Jun 24, 2021
guparan added 2 commits June 24, 2021 17:05
@guparan
[All] CLEAN remaining [[deprecated]] attributes
ec23b40
@guparan
Merge remote-tracking branch 'sofa-framework/master' into clean_lifec…
106322c 
…ycle_for_v21.06

# Conflicts:
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/AffineMovementConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/PartialFixedConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/PlaneForceField_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/PointConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ProjectDirectionConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ProjectToLineConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ProjectToPlaneConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ProjectToPointConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/QuadPressureForceField_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/SkeletalMotionConstraint_test.cpp
#	modules/SofaBoundaryCondition/SofaBoundaryCondition_test/TrianglePressureForceField_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/AverageCoord_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/ComplementaryROI_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/DifferenceEngine_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/DilateEngine_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/Engine_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/ExtrudeEdgesAndGenerateQuads_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/MeshROI_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/PlaneROI_test.cpp
#	modules/SofaGeneralEngine/SofaGeneralEngine_test/SphereROI_test.cpp
#	modules/SofaGeneralImplicitOdeSolver/SofaGeneralImplicitOdeSolver_test/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp
#	modules/SofaGeneralTopology/SofaGeneralTopology_test/CylinderGridTopology_test.cpp
#	modules/SofaGeneralTopology/SofaGeneralTopology_test/SphereGridTopology_test.cpp
#	modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleModel.h
#	modules/SofaMiscCollision/src/SofaMiscCollision/OBBModel.h
#	modules/SofaMiscCollision/src/SofaMiscCollision/RigidCapsuleModel.h
#	modules/SofaMiscFem/SofaMiscFem_test/LennardJonesForceField_test.cpp
#	modules/SofaMiscFem/SofaMiscFem_test/LennardJonesForceField_test.h
#	modules/SofaMiscFem/SofaMiscFem_test/LennardJonesForceField_test.inl
#	modules/SofaMiscFem/SofaMiscFem_test/TetrahedronHyperelasticityFEMForceField_params_test.cpp
#	modules/SofaMiscFem/SofaMiscFem_test/TetrahedronHyperelasticityFEMForceField_scene_test.cpp
@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Jun 24, 2021
@guparan
Copy link
Contributor Author

guparan commented Jun 24, 2021

[ci-build][with-all-tests]

@epernod
Copy link
Contributor

epernod commented Jun 24, 2021

241 files +953 −3,830 en fast merge 😉

guparan added 2 commits June 25, 2021 10:31
@guparan
[plugins] FIX old SofaTest/Python_test.h includes
d200a0a
@guparan
Merge remote-tracking branch 'sofa-framework/master' into clean_lifec…
03e4a27 
…ycle_for_v21.06

# Conflicts:
#	SofaKernel/modules/SofaHelper/src/sofa/helper/visual/DrawTool.h
@guparan
Copy link
Contributor Author

guparan commented Jun 25, 2021

241 files +953 −3,830 en fast merge wink

Just to make sure it will be seen because it's needed for v21.06 😄

@guparan guparan mentioned this pull request Jun 25, 2021
Merged
@guparan
Copy link
Contributor Author

guparan commented Jun 25, 2021

[ci-build][with-all-tests]

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #11.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #12.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #13.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #14.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #15.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #16.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #17.

To unlock the merge button, you must

@sofabot
Copy link
Collaborator

sofabot commented Jun 25, 2021

[ci-depends-on] detected during build #18.

To unlock the merge button, you must

@guparan
Copy link
Contributor Author

guparan commented Jun 25, 2021

Ready for some "review" (if you are brave enough)! 💪

fredroy
fredroy approved these changes Jun 28, 2021
View reviewed changes
Copy link
Contributor

@fredroy fredroy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me after super quick glancing over it; and the CI seems happy too so...

@fredroy fredroy merged commit 8cf1a9c into sofa-framework:master Jun 28, 2021
@guparan guparan added pr: do not squash To merge instead of squash a pull-request pr: breaking Change possibly inducing a compilation error labels Jun 28, 2021
@guparan guparan deleted the clean_lifecycle_for_v21.06 branch October 29, 2021 08:19
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels May 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fredroy fredroy fredroy approved these changes

Assignees

No one assigned

Labels

pr: breaking Change possibly inducing a compilation error pr: clean Cleaning the code pr: do not squash To merge instead of squash a pull-request pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status ready Approved a pull-request, ready to be squashed

Projects

None yet

Milestone

v21.06

Development

Successfully merging this pull request may close these issues.

5 participants

@guparan @epernod @sofabot @fredroy @hugtalbot